Tag cleanup and additions for 1.21 #3807
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes FabricMC#3742 Closes FabricMC#3755 Closes FabricMC#3790 Closes FabricMC#3731
|
Note there is talk about the wolf variant biome tags on the other PR here: Is wolf variant biome tags something Fabric is willing to allow? It's an odd case that requires overriding some vanilla files to work properly in a sensible way. (Original request is #3701) |
modmuss50
reviewed
May 28, 2024
...on-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
Show resolved
Hide resolved
|
Tool tags were misspelled. so instead of Tried to implement the change as non-breaking as I can. Caused an awkward naming of one field |
modmuss50
approved these changes
Jun 2, 2024
modmuss50
added
last call
modmuss50
reviewed
Jun 10, 2024
...ion-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java
Show resolved
Hide resolved
TelepathicGrunt
added a commit
to TelepathicGrunt/fabric
that referenced
this pull request
Jun 12, 2024
modmuss50
pushed a commit
that referenced
this pull request
Jun 17, 2024
* Fix new tags not being plural Fixes #3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
Su5eD
pushed a commit
to Sinytra/FAPI-Mojmaps
that referenced
this pull request
Jul 4, 2024
* Fix new tags not being plural Fixes FabricMC/fabric#3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
Su5eD
pushed a commit
to Sinytra/ForgifiedFabricAPI
that referenced
this pull request
Jul 4, 2024
* Fix new tags not being plural Fixes FabricMC/fabric#3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
|
After checking the |
|
@purejosh which tag are you talking about.nouns are plural. Adjectives are not. So c:tools is plural. c:tools/spear is technically plural as you read it as spear tools. Spear is the adjective for the tool |
Apologies, I posted hastily. I checked the |
38 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With 1.21 shaping up to be another large breaking change for many modders, we can use this for our advantage to do some tag cleanup work. This is paired up with this PR: neoforged/NeoForge#1030
The changes includes:
Adding a
c:music_discstag since vanilla is removingminecraft:music_discsin 1.21. A log warning was added for this so people know they can migrate over to the c tag for music disc stuff that should not be reliant on the JUKEBOX_PLAYABLE item component.deprecated of
c:coaltag that I missed before. I could not find anyone to say why this singular-named tag exists when vanilla has aminecraft:coalstag that would work for modder's use cases. So it seems better to deprecated this tag and add a log warning if found to tell people to migrate to the vanilla tag instead.raw_blocksitem tags are deprecated because thestorage_blockstag for the raw blocks already exist and is the same. Log warning added for this migration cleanup. The deprecated of these tags should reduce confusion in this area for modders.Added
c:leatherstag on request to match NeoForge side.Removed Eroded Badlands from Sparse Vegetation Overworld since the biome has no trees at all and that normal badllands and desert isn't in the tag in first place.
Tool tags were misspelled. So instead of
c:tools/bows, it should had beenc:tools/bowbecause tools is the noun to be plural and bow is the adjective. So it would read as Bow Tools instead of the awkward Bows Tools. Attempted to be added in non-breaking way as possible.Deprecated Shulker Boxes block tag because Minecraft has a Shulker Box block tag
Glazed Terracotta block/item tag, Concrete block/item tag, Concrete Powder item tag.
Please comment here if there's any change here that you dislike or love! Or if you have suggestions of new tags to add, to sync from other loader, or should also be removed/adjusted.
See the below issue reports for more details and reasoning for each of this PR's changes:
Closes #3742
Closes #3755
Closes #3790
Closes #3731